Re: PATCH for Bugs 1844 and 1845