Adjust source order
0.2.1