Fix potential path bug