fix method typo
Merge branch 'canonicalfix' into release-149