Fixes #1080