Fixed an issue with collect_incoming_data