wip fix for upload problem