More path choices in the specification, and a fix.