Fixes #1162