fix some structure.