BL-793: handle special case of long words