Fixes #1078