Re: #1703 - fixed