Re: #1684 - fixed