Fix strict matching bug