File upload hotfix, todo added too