Fixed issues with local vs local matches