Fixed Guest highlighting bug