fix for FB5734
Merge pull request #109 from vladmunthiu/develop

fix for FB5734