try to fix mapping