Merge pull request #1491 from apache/tristan/unaliased-sources

Handled unaliased and mis-aliased sources