Fix data.000 issues for now, dirty hack, but working