Fixed indicator bug