Complete fix #4478
Merge pull request #4489 from magistere/master

Complete fix #4478