Fixed the path issues in both index and inner