Re: #1580 - fixed (?)