2014.08.26 Some bug Fix