Fixes #1106