Fixes #1656