Fix for label-less messages