I am not sure that the new code is really wrong, as to some degree it coould not find anything