Implementing the uploader fix