fix some mess