fix mapping placement