Fix midnighthour bug
V1.2