Fixes issue #2366
Merge pull request #2368 from xyz/2-1-stable

Fixes issue #2366