Fix onComplete callback