Fix UDP case
Merge issue704 fix - required for testing