more fixing2