Applied temporary fix for draw-bug