Fixes #1872