fix issues of restructure