Fixes #1043