MCH/CP - fix to us breaking the drawing of shapes