Respect the sourceIndex

Signed-off-by: Sheel Choksi <schoksi@pivotallabs.com>