Another fix attempt for the integration test bug.