improvement needed for weld 2.0.x