Bug fix with am/pm