Fix fish remove bug