Fixes #1552