Fixes #1103