fix-bugs-20140827-X1