Fixes #2407 - Merge branch 'fix-2407'