McConnell, fixes #509