Fixed 12/24 hr bug