Attempting to fix annoying mute bugs