just fix some issue