Fixes #3184
Merge pull request #3205 from Zuhayr/feature

Fixes #3184