fix hook not called - some changes might not be necessary