Change getter in to property