Nir - fix handle issue