custom fix for uploader