Path matching - fixes #17