Fixes #1772
Fixes #1772