Actually run keyExpansion, fixing a problem, but not all