Better hooking strategy

(thanks @vipere)