Comment bug fixed
Merge from liaowei