"Zero hour" bug fix