Fixing Id class