fix collect data mechanism