Added @ to list of valid_chars for filenames