Fix 1737, QSS small fix
Merge pull request #1769 from juancarlospaco/fix/1737

[QSS] Fix 1737