It's will be better
Merge pull request #2423 from RJ2:bugfix_5