Fixes #1343