QUGC-164 fixes the issue
Merge branch 'QUGC-164/superset-fail'