fix #405

Added volume control blocks

Please test and review it.