Merge pull request #2417 from thefuzzy0ne/fix/upload_dry

Fix/upload dry