bugId-43207 fixed bad refactoring