Fixes #1858