Fixed bug caused by year