Patch added for source_index