Fixes #1806