Found work around for problem with matching