Fix volume not carrying across play/stop