Drawing fix from mstange.