Fixes #1342