need fix 2 b-fy