Fixed extend source option