Fixes #1884