Fixed issue with no complete callback provided