Resolve PEATE vs. CLASS RGB problems [1540]