Buzz fix