Product fields ordering fails when nodes standard fields get weighted > 10

Ubercart product design wrongly assumes that non Ubercart fields will always be set to 0 or something like that.
CCK is almost enabled in any Drupal install, and this module allows the ordering of all node fields.
Every time the order of fields is changed on the content type xxx, the weight value in content_extra_weight_xxx increases and soon goes beyond 10.
Ubercart only allows to set its fields weight between -10 and +10.
This is definitely a wrong design, as Ubercart should rely on the _content_extra_weight() hook for ordering its fieldset, not handling its own conflicting weighing.
In the meantime, I changed in uc_product.admin.inc ,

function uc_product_field_settings_form() {
...
    $form['fields'][$label]['weight'] = array(
      '#type' => 'weight',
-      '#delta' => 10,
+      '#delta' => 100,
      '#default_value' => $field['weight'],
    );