bug fix for RV/RF in the WS