WIP: Fix an error with the USs creation in bulk