fixed order of sourcing bugs