Fix issue that was causing integration test failure.