Fix bug to match on id