Small patch to enable custom messages