Integration issues

Fixing an integration issue in latest patch.