Fixes #1841