Fixes #1242