Fixes #1335