[fix] Better connection hooking