Fixed issue found in integration testing