fix-bugs-20140826-X1