Fixes #1113