Replace ND with MY
Fix source_addr encoding