Merge "fix to save volume correctly"