2013-7-22 remedy some error