FOund and fixed a midnight bug in converting 12 to 24 back to 12 hours