removed special case for MAP and fixed Assertions