Fixed bug with am/pm