fixing property accessor issues for this version that we need