Fixed complete callback