Fixes #1116