Fixes #1727