Fix volume handler