Paint bug fix 1