Fixed issue with device messaging