Fixed noon/midnight issue for 12hr time