Fixing bug with years