Fix Indicators