fix inaccurate matching for abandoned