issue #942 some hooks added