Uploading support but still with bug