LB-692: Stt issues

fixed.
Merge pull request #150 from nistormihai/master

LB-692: Stt issues