fix some issue :)