Fixing receiverId bug