Fix volume mapping