Re-arrange so volumes get detached correctly.