More robust and clean volume control