Fix upload files process - refs BT#9041