design fix(2)