Fixes #1844