fixed the sender Identity bug partially