Another attempted fix on the uploader