Fix for issue 4216
Merge pull request #4220 from AndresTanasijczuk/fixForIssue4216

Fix for issue 4216