Fixing issue with live/on switch