Fix expansion support.