fixes

not fixed yet