re #868 - Removed address field