Fixes #1278