fix rf issues