Job Messaging fix