Proper stop upload support