SlaveListener bug fix