Fixes #1446