Fixes #1300