contextual expansion fix