Temporary fix for noon/midnight