Fix RF support