fw_len fix missing from previous push... adding it again.