Fixes #1792