Fix in post expanding