Fixed not running issues