Fix 1606, QSS small fix
Merge pull request #1768 from juancarlospaco/fix/1606

[QSS] Fix 1606