Close Bug 164 from Nelson