Fixes #1874