Minor fix, needs to avoid unncessary message deserialization