Avoid hitting non-existing cell #2359