Merge pull request #203 from nidzix/master

LB-1842: Quirks mode is not looking good for stt.
LB-1842: additional fix