fix some trouble