#1970: Fix bug for new uploads