Fixes #1647