fix remove issue