Fix old helper