Fix for current year