Wei.Feng - 2011-05-18

patch for the bug