This naive fix passes all tests.