maintainance v1 fix for radekm's Hashtbl.map bug #354