fix 'on' func
Merge branch 'onOffFunc'