RPV-160 Fix for complication errors from pull request