issue-21 bug fixing in design