fix bugs in Oct 31, 2013