fixed all crashes with the new completion block