fix handleremove