LB-1887 fixed
Merge pull request #799 from msat-cont/master

LB-1887 fixed