Fixes #1 now id is passed in correctly