Fix #1973
Merge pull request #2182 from seven-phases-max/fix-1973

Fixes #1973