Issue 5924 fix
Merge pull request #1172 from andralex/5924

Fixes Issue 5924