Fix to accomodate change in the code-walker