[FIX] Reference cr and uid correctly