Fix year check

This should go into 2.061 and master too.