Fixes #1551