Re: fix for #3219