Year selection bug fix