Fixes #1828