[WIP] Fix property access version