Fix index to return only derived class