Fixed file creation order