fix data issues

Change-Id: I6e8b3a59199803b091875ae5730c5d6b4304276f