Fix for #1078 and saved hook
Fix for #1078 and saved hook