Fix queue creating in sender and reformat