fix as per comments for on off events