Fixes a problem with messaging