Fix for #2360
Merge pull request #2550 from eliangidoni/fix-2360

Fix for #2360