Hotfix/fix control unmap

See commit messages