fixed evaluate map