WELD-1430 First attempt