Fix var name issue on file fields