Fix behavior of PrevYear/NextYear