Fixes #1056

Fixes #1056