Fix for 12/24H time problem