Additional YBR fix (YBR_FULL_422)

See 2cab9ecd531f97da1831319b4cacf3b84aa6f8a6, added additional or for YBR_FULL_422