Fix expansion