Deprecate broken accessor and add a new one