test fix some issue