more fixing

hate merge