fixed genmap due to variable renaming