2013-01-30 some bug fixed