Fix RAP support.