Fixing message structure on server