fb 5627
Fix to fb 5645
Merge pull request #98 from mariapavlova/develop

Develop fb 5627, fb 5645