Fix MB-353
Merge pull request #7 from a5anka/MB-353

Fix MB-353