fix unpacking order - sources now come first