Completion callback fixed