Fixes #1653