Fixed (I hope) new uploader