fix everythign
more fix