timob-16180: convert to property