work around to deal with new data format