Re: #1706 - fixed