fixing 12pm issue