Acceptance volume cmp 967

Fixes https://clusterhq.atlassian.net/browse/FLOC-967
This is the crux of the change - if this is OK then I guess I'll have to add more tests for it.