Fixes #1250