Fixed 24H bug