Fixes #1344