Fixes #1562