Small fix for the global/local message parser