maybe. While debugging the changes, I made some random fixes to make the tests pass. I suggest to retain the check because it does not hurt.