Fix running issue
Fix index