fix somethings [2]