Small fix of hooks