Re: #1446 - tidy