Fixed issue with pm/am screwing up the timezone conversion