Decode fixing