fix some err too