Fixing Time Issue