patch for address template fixes #1749