Fixes #1773