Fixes #1086