Fix issues with not running else