Fix #4189
Merge pull request #755 from ddanielvaz/fix-4189

Fix #4189