Recurring fix, cherry-picked nabin's address template fix