Expansion constructor fix