Hopefully fixed hook physics for good
merge commit