Fixes #1063