Fixes #1109