Fixed issue with message not being overridden.