fix-bugs-20140824-X2