Time issue fix