fix on mapping collection