Unpacked, hopefully fixed hook