little more fixing