Fixes #1352