Fix 24 hr issue