Fix expansion to use make construct