Fixed onCompletion callback