Fixed .on and .off