Cornyn, fixes #520