some design fix