Fixes #1349