a little more fixing