Now no invalid filenames can be used