Fixes #1801