Fix MB-297
Merge pull request #29 from a5anka/MB-297

Fix MB-297