Fixes #1556