Fix for #upload