Fixed SQA item #20 in design