modify rc handling bug