Fixes #1805