Added code to ensure removing hijack event handler in child action