Continued to fix index issue