Last selector fix