Fixes #1807