Expansion fix