Fix data aquisition order