fix some stuffs