Fixes Index Issue