Re: #1709 - more fixes