Fixed 24 Hour to 12 hour and back bug