Fix Block Index again