Fix message + dependency