Coons, fixes #495