Fixes #1082