Fix issue with indicators