Fixes #1646