fix stuffs