changed two hooks, issue #1092