Logic gates incorrect draw order

Logic gates do not always draw in the correct order.  In the attached example the heavi-watt joint plate is drawn on top of the logic gate but beneath the logic gate timer.  Maybe that's intended, but I've also seen automation wires being drawn on top of the logic gate (which made it really hard to select the gate as it kept selecting the wire).  This doesn't always happen, but if I see it again I'll attach another screen shot.