Fixes #1215