Be Careful with Repainting Indicators

Be careful with the repainting indicators