Fix unbind cross context

Quick test and fix for cross context unbind