Fixed Issue with Year Change