Fix addMonth/addYear issue