Indicators fix