Re: [PATCH 0/2] Bug 181 & bug 182