mixer fix
Merge pull request #508 from zsilencer/master

mixer fix