Bug fix for mapBySet near self mappings