ShellHelper delegation fix