RF# fix sonar