Fixes #1655