fix multiple handlers