[OEM-264] Adjust from address box to avoid wrapping