Fixed the turn-off issue with a singelton, yei