Address comments: corrected event an handler's name