[#1356] design fix