Fixed location of onComplete callback