Bugfix/run and receive

Also include previous pull request.