Fix for TO Uploads