[QSS] Fix 1606

- Fix #1606
- QSS small fix


**Before**
![screenshot](https://camo.githubusercontent.com/cf3d72f9a889830806b3577fa60fa6172e4dd451/68747470733a2f2f662e636c6f75642e6769746875622e636f6d2f6173736574732f343036393437362f323330303730352f65643831343135342d613130312d313165332d386135622d3361356534373364353665382e706e67)

**After**
![temp](https://cloud.githubusercontent.com/assets/1189414/3003910/3ed8cbe2-dd68-11e3-8127-b98895833d8a.jpg)


Brancho:  fix/1606