Fixes #1067