SSP-2423 - adjust length cap to reflext field change