correctly handle adding the @ to file names