fix bugs 2014-08-19