Fix the id and property access