fixed 12pm bug