Fixes #1522