Issue 2227 fix
Merge pull request #2429 from VinceAngel/bug_2227

Issue 2227 fix