Y2K patch (backported from 3.2.3)