#118 fix map implementation