remove index
new FIX
Merge branch 'Fix'