Datacorder fix