Fixes #1083