Fix the id and property access

/to @ritch