Fixes #1804