improvements: more strict regexp for path