Bugfix on design