fix uupart handling