fix for SPC-944 add multimap