Fix handler add/removal process