refixes messaging format