wang huazhong - 2012-05-18

Fixed with revision 12784 and 12786