Issue 1300

Fixes #1300 once merged.