- for some reason, this worked on Linux (?!?)
 - for some other reason, there doesn't seem to be 2 different modes for add_file

Close #4004