Implemented the Steve Fenton fix.

Thanks Steve!