Fixes #1798