Some mess got into the previous commit [Revert AutoVoice.php]