Fixes #1528
Merge pull request #1535 from Particular/feature-1528

Fixes #1528