Re: Fix for #3464