Fixing Bug #10309 (improved)
Merge pull request #161 from Jako/master

Fixing Bug #10309 (improved)