makes wrapper an explicit parameter, fixes misbound events