still fixing chat bug