Fixes #1803