No, the answer is 21. You ignored the "Shape is distinguishable by touch before drawing".