fixed rf bugs