Only One Index File
Fix Some Short Circuiting