more fixing code