Fixes #1658