Fixes #1783