Fix issue causing test failures