Fixes #1321