Fix this feature to use the correct default key accessor.
bundle this up into the previous release.