Merge pull request #564 from Ewocker/fix-path-predicate