This fixes #1061