Another fix in ivas-interop-on-merge-request