Fix from index to property