Y2K bugfix