Comment 10 for bug 983827

Apparently this bug popped up in two different places in the code. I've tested it in stable and unstable branch and I can't reproduce it in the stable version. Which probably means that the intial solution fixed it for stable branch. Unstable branch is working with volumes a different way so another fix was required.

Thanks for all the info. I commited the fix and you can try the unstable branch again.