Fixes #1294