Fixed an issue with volumes being null