Be Careful with Repainting Indicators

Be Careful with Repainting Indicators