fix multiple events problem with surfy