Fix 24hr issue