fix the live/on bug