Fixes #1192