Cleaning
Clean and fix a path-matching bug