bug fix from the integration test.