No need to use a property, also prev version was wrong anyways. Need to test this change...