Added leap year fix