Index Fix for live