fix on mapping