Fix index spaces