Re: #1760 - data fixes