Fix for #2409
Merge pull request #2452 from eliangidoni/fix-2409

Fix for #2409