fixed over index
merge fix