Fix for broken chat