Volume fix merge