fixed 2_6