Fixed even MORE (again) painting problems