Fixing 24 hour bug