Fix bug where 1-month grace period was ignored