Fix for radio bugs