Fixing 2nd time upload issue