Fixed bug on init
Updated indicator