Fix RD-9 and J52