Fixes #1275