Naparo's RAW HD stage fix up part 2