Halton Huo - 2008-07-10

patch for this bug