Fixed the data collector