Fix issue with wrong time, 24 hour format