bug fix, use uid instead of id