Fixes #1879