Data source index overflow fix