BugFix: better coordinate matching