Fix from Steve Tate.