Fixed even mjore paint problems