Conflict with SIUnits solved (Colle Frederik)