Fixes #1717