Fixes #1867