Better fix for chat interactions issue