Keep order of sources - fixes #233