trying to fix the index issue