Fixed bug: mapped events triggered multiple times