Fixes #1085