Fixed sequential Cli run (Race condition)