Fix bug 11390
Better fix for bug 11390 :p
Merge pull request #1674 from BioTronic/master

Fix bug 11390