Handled first time uploading issue