Updated RF API due to reports of cycle errors