Hotfix/unmap signal