Add no-wait option to runner