Fixed uploader issue