Fixes #1735