Fixed bugs for pledge redirection