Fixed bug where completion block was being called twice