source_weaver fixed