LB-692: Stt issues

fixed.