hopefully fixed hooking...again