Fix expansion ...