Fixes hooks return