Fix #1 (include args from other hooks)