Hotfix pass the handle along from resolve call, don't regen again