Fixed usage of id