Fixed 24hr bug