Fixes #1308