Fixed constant and unpredictable reordering during file upload (#716)