fixed messages format
fixed messages format