Fixed indicator issue