Fixed Time Error Issue