Fix broken str_remove