Fixed othersource fetching with slight errors