I think this should fix various problems with queued incoming data not being