Further resolve CID 1222223
Merge pull request #393 from Dmitry-Me/furtherResolve1222223

Further resolve CID 1222223