Added check for multiple messages closes #1701