Fixes #393.
Merge pull request #418 from Dunbaratu/fixes-393-local-volume-persist

Fixes #393.