fix recent bug for when fw_id is explicitly set to 0 by user