Cleaned up mixed protocol issue.