Fixed bugs fromt esting
Merge pull request #939 from maykinmedia/bb-1939

Fixed bugs fromt esting