Fixed an issue where the event binding were referencing the $wrapper variable that changes.