Fixed plan, stubbed out id check