Fix path creation
Fix path creation