Fix issue with calling completion handler