Fix an error in upload (when try to use groups and properties at same time)