Fixes #1347