Bugfix: use an onComplete callback both times