Fixes #1548