Attempt to fix chat bug