Fixing issue with sender ID