part of WELD-1398 - remove magic numbers