fixed bugs caused by changes of data format