Fixes #1279