Merge pull request #2910 from popcornmix/fix_volume_fix