Fix for missing completion block