1.2.4 ChatHandler Fix