Fixes #1290