fixed :) also applied the changes to the on method to make it more consistent