Fixes #1560