bug fix for rf