Fixes #1876