Hack to make batch cases expand to fit the message