Maybe another solution to make compatible to Weld 2.0