Fixes #1846