Fix MB-669

Fix done by Ishara Premadasa in svn commit r203786.