handleremove fix