Fixes #1100