Fix for using the wrong chat handler