Fix bug - not running when initialized