Fixed EVEN MORE (3) paint problems