fixed c47bd93 extended hook to respect toggle