Fixed the completionHandler bugs