Continuation of fix for parent_link_active