Added extra check for year