Improve muting