Implemented E.S. Quinn's Time fix