fix some issue
fix some issue