Fixes #1280