fix some other bug = =