fix after change to Map