Fixes #1204