Fix an issue that was causing integration tests to fail