Bug fix in DRAW-LAYOUT