Fixing sender/receiver ids