Fixed issue with global messages