fix to data struct