Bugfix

Merge Bugfix into Async