Merge pull request #1788 from bobo1on1/volampfix