Fix message to be inline with 1.x