Fixes #1770