fix some issue