MUS-85: Draw-Bug Fixed