Work on chat bug