Fix #276 matching problem