Trying to fix expansion from basic keys.