[decode] Edit according to Paolo review