Hotfix: needed to check for undefined on hit