Fix AM/PM Bug