Fixes #1809