#472 Replace old fashioned dot notation