Fixes #1322