adapt to crossdata 0.1.1