hot fix with remove link triggers