Grace period limit fixed