fixed #5639
Merge pull request #104 from kermie/b-5.1-ce

fixed #5639