Improved jump-style hooking (fix #264 and fix #247)