12 hour format bug changed
12-hour format bug removed