fix messages for #626