Fix: don't use github internal IDs