fix some design error