Still trying to fix upload bug