Fixes #1072