Fixing Time bug